Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(RHEL-44630) netif-naming-scheme: disable NAMING_BRIDGE_MULTIFUNCTION_SLOT #283

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

lnykryn
Copy link
Member

@lnykryn lnykryn commented Jul 1, 2024

This effectively reverts 66425da.

The commit assumes that if the network interface has multifunctions, then the function fields of the pci devices under the same PCI bridge device are unique.
But it seems not, at least on some setups. See issue #28929. Let's revert the change, and always refuse to set slot base naming if a PCI bridge is detected.

Fixes #28929.

(cherry picked from commit af7417a)

Resolves: RHEL-44630

@github-actions github-actions bot changed the title netif-naming-scheme: disable NAMING_BRIDGE_MULTIFUNCTION_SLOT (RHEL-44630) netif-naming-scheme: disable NAMING_BRIDGE_MULTIFUNCTION_SLOT Jul 1, 2024
@github-actions github-actions bot added tracker/unapproved Formerly needs-acks pr/needs-ci Formerly needs-ci pr/needs-review Formerly needs-review labels Jul 1, 2024
Copy link

github-actions bot commented Jul 1, 2024

Commit validation

Tracker - RHEL-44630

The following commits meet all requirements

commit upstream
66a463b - netif-naming-scheme: disable NAMING_BRIDGE_MULTIFUNCTION_SLOT systemd/systemd@af7417a

Tracker validation

Success

🟢 Tracker RHEL-44630 has set desired product: rhel-9.4.z
🟢 Tracker RHEL-44630 has set desired component: systemd
🟢 Tracker RHEL-44630 has been approved


Pull Request validation

Success

🟢 CI - All checks have passed
🟢 Review - Reviewed by a member
🟢 Approval - Changes were approved


Auto Merge

Success

🟢 Pull Request is not marked as draft and it's not blocked by dont-merge label
🟢 Pull Request meet requirements, title has correct form
🟢 Pull Request meet requirements, mergeable is true
🟢 Pull Request meet requirements, mergeable_state is clean
🟢 Pull Request has correct target branch main
🟢 Pull Request was merged

@github-actions github-actions bot added tracker/missing Formerly needs-bz and removed tracker/unapproved Formerly needs-acks pr/needs-ci Formerly needs-ci tracker/missing Formerly needs-bz labels Jul 1, 2024
Copy link
Member

@msekletar msekletar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the wording of the manpage paragraph. It is difficult to understand in my opinion so I've tried to rewrite it for better clarity

Never generate a slot name when a PCI bridge is detected.

Since version "rhel-9.0", we have generated slot-based names for PCI multifunction devices, because we assumed that it is enough to use function numbers to distinguish between devices. However, name conflict can occur if these devices are not children of the same PCI bridge, e.g. there are multiple PCI bridges in the same slot.

@github-actions github-actions bot added pr/changes-requested and removed pr/needs-review Formerly needs-review labels Jul 2, 2024
This effectively reverts 66425da.

The commit assumes that if the network interface has multifunctions,
then the function fields of the pci devices under the same PCI bridge
device are unique.
But it seems not, at least on some setups. See issue #28929.
Let's revert the change, and always refuse to set slot base naming if
a PCI bridge is detected.

Fixes #28929.

(cherry picked from commit af7417a)

Resolves: RHEL-44630
@lnykryn lnykryn requested a review from msekletar July 2, 2024 10:06
@github-actions github-actions bot added pr/needs-ci Formerly needs-ci pr/needs-review Formerly needs-review and removed pr/changes-requested pr/needs-ci Formerly needs-ci labels Jul 2, 2024
Copy link
Member

@msekletar msekletar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions github-actions bot removed the pr/needs-review Formerly needs-review label Jul 3, 2024
@github-actions github-actions bot merged commit 753e1b1 into redhat-plumbers:main Jul 3, 2024
30 checks passed
@champtar
Copy link
Contributor

champtar commented Jul 3, 2024

You are missing { "rhel-9.5", NAMING_RHEL_9_5 } in the .c

@lnykryn
Copy link
Member Author

lnykryn commented Jul 3, 2024

You are missing { "rhel-9.5", NAMING_RHEL_9_5 } in the .c

Good catch thanks! #284

@jamacku jamacku added this to the RHEL-9.5.0 milestone Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants